;plpolop
Merge branch 'master' of https://github.com/sinholic/dixonsgame

Conflicts:
	dixonsgame/Ipad.storyboard