added from merge
.gitignore is now working
added .gitignore, because it was driving me INSANE that it wouldn't ignore it, so whatever
updated files
merge complete
merge made
migrated css for mobile devices to modernizr adding a custom build of modernizr js and linking it in the index view
Merge pull request #17 from individual11/master

Custom css for touch devices using modernizr