Add user tests
Add page load listener to js file
Merge branch 'master' of https://github.com/tarynsauer/city_app