removed data controllers
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
Fixed some warnings, general cleanup
Merge branch 'Cole' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014