Igored package.json for heroku deployment
Merge branch 'master' into heroku
corrected .gitignore
fixed .gitignore merge
Merge branch 'master' of heroku.com:cryptic-waters-8987
footer nearly asthetically complete
playing around with twiter bootstrap with the slideshow, needs to be fixed