Added modals for new user and edit user
Merge branch 'master' of https://github.com/JuhaMikkola/fitbyfriday

Conflicts:
	app/views/home/index.html.erb
	app/views/users/_form.html.erb
	app/views/users/show.html.erb