Recommit
Merge remote-tracking branch 'origin/master'

Conflicts:
	MindHack2014/res/values/strings.xml
Merge branch 'master' of https://github.com/rwhig-1NS/mindhack2014

Conflicts:
	.gitignore