-n 
added heroku
-n 
some touches
-n 
autosave deploy
-n 
fixing all the crap that modernizr broke
-n 
fixing all the crap that modernizr broke
fixed merge conflicts