modified application controller to remove SSL requirement
don't know what I did with the last 3 hours
Merge branch 'master' of https://github.com/island-foxes-2013/KnOverFlow into maria_testing_branch
100 percent test coverage on users controller
Merge branch 'master' of https://github.com/island-foxes-2013/KnOverFlow into maria_testing_branch
attempted to create controller tests for private methods
Merge branch 'master' into maria_testing_branch