Merge pull request #1 from ShadMickelberry/bootstrap

Bootstrap
Merge pull request #2 from ShadMickelberry/bootstrap

Bootstrap
Merge pull request #3 from ShadMickelberry/bootstrap

Added Favicon
Merge pull request #4 from ShadMickelberry/bootstrap

At the hack night changes
Changes made at Hack Night
Merge branch 'master' of https://github.com/ShadMickelberry/starter-app into bootstrap