cleaned up and consolidated views and home template
updated register link on login.html to say register
merge for pull
removed mergetool files
Merge pull request #8 from j3py/julian-tests-2

Julian tests 2