working on controller conversion
Merge branch 'master' of github.com:poultergiest/cs378-project1
began creating object files
Merge branch 'master' of github.com:poultergiest/cs378-project1