Merge branch 'master' of https://github.com/senacor/Hacking-Days-2013