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