what
Merge branch 'master' of https://github.com/JMarple/HackBean2014
wut
ugh
I don't get this error
Merge branch 'master' of https://github.com/JMarple/HackBean2014