Merge branch 'gh-pages'

Conflicts:
	js/scripts.js
	js/scripts.min.js

js/scripts.js

@@ -249,9 +249,14 @@
         });
 
         if (typeof twitterFeedUrl !== 'undefined') {
+<<<<<<< HEAD
             var yql = 'http://query.yahooapis.com/v1/public/yql?q=' + encodeURIComponent('select * from json where url="' + twitterFeedUrl + '"') + '&format=json&callback=?';
             $.getJSON(yql, function(data) {
                 $.each(data.query.results.json.json, function(i, gist) {
+=======
+            $.getJSON(twitterFeedUrl, function(data) {
+                $.each(data, function(i, gist) {
+>>>>>>> gh-pages
                     var tweetElement = '<div class="tweet animated fadeInUp hidden"><p class="tweet-text">' + linkify(gist.text) + '</p><p class="tweet-meta">by <a href="https://twitter.com/' + gist.user.screen_name + '" target="_blank">@' + gist.user.screen_name + '</a></p></div>';
                     $('#tweets').append(tweetElement);
                 });