new button stuff
Merge branch 'master' into new_button_stuff

Conflicts:
	app/views/sessions/new.html.erb
Merge branch 'new_button_stuff'
 Merge branch 'master' of github.com:msmith7904/burger_button