Updated form
got login to work
added Noty, not working
New registration page
Merge pull request #26 from Screengoose/register_update

Register update
commented out homepage.js
Merge pull request #27 from fuzzybabybunny/login

Login
reformat initial nav bar
Changed semantic to stop errors
Merge pull request #28 from Screengoose/register_update

Changed semantic to stop errors
resolved conflict
Merge branch 'MuWahLee-responsive_nav'

Conflicts:
	app/assets/stylesheets/application.css
Merge branch 'MuWahLee-responsive_nav2'