hackathon
minor changes
added controllers
Merge remote-tracking branch 'upstream/CS7496' into CS7496