ignore file in
Merge branch 'master' of https://github.com/QuasimodoNZ/Hackfest2014