At the hack night changes
Merge pull request #4 from ShadMickelberry/bootstrap

At the hack night changes