Stuff

controller
menu(not sure if we will use it)
Merge branch 'master' of https://github.com/RemingtonJames/CSC440