unused files deleted
gitignore fix?
adding controller tests for user
more tests!
merging master