added two buttons... again
Merge branch 'master' of https://github.com/gadicker/UCFall2013