added some buttons and labels which i guess we don't need
Merge branch 'master' of github.com:sqow/fuckthisjam-2014-05