fixed tip off the page
Merge branch 'master' of https://github.com/rkgibson2/hackfest-project
added new files, set up branches in masteries