adding login erb
adding login erb
Fix merge issue
Merge branch 'master' of https://github.com/franjohn21/doger_much_wow into development

Please don't break everything
Controller tentatively complete, not tested
adding to login erb
Merge branch 'development' of https://github.com/franjohn21/doger_much_wow into development

Conflicts:
	app/controllers/index.rb
development
not sure what this one is
Merge branch 'development' of https://github.com/franjohn21/doger_much_wow into development
Fix login
index stuff
stuff
Pass user object to html
adding to index view
meh
Fix @user for homepage
Merge branch 'development' of https://github.com/franjohn21/doger_much_wow into development
Homepage, userpage MVP
commit to pull