Current js, working on login and registration
Updates to js
Merge branch 'master' of https://github.com/RSWSMUGirl2016/Burger_Bar

Conflicts:
	js/main.js