fixed stylesheet issue..maybe
commented out opera border radius
made css changes to homepage, and added two burger images
"Commiting so I don't have to stash"
Merge branch 'master' into alex_tuesday_changes

Conflicts:
	app/views/orders/show.html.erb
Merge branch 'alex_tuesday_changes'
Merge branch 'tuesday_am' of github.com:msmith7904/burger_button

Conflicts:
	app/views/orders/show.html.erb
	app/views/users/new.html.erb
testing changing image refs
try again w image_path helpers
try again .css.erb
again css
changed css files to css.erb and added ruby to images
Merge pull request #62 from msmith7904/tuesday_noon

changed css files to css.erb and added ruby to images
Merge branch 'master' into update_gem_experiment_monday_midnight

Conflicts:
	app/assets/stylesheets/application.css.erb
	app/views/orders/errors.html.erb
	app/views/users/new.html.erb
	lib/orderin.rb
Merge branch 'update_gem_experiment_monday_midnight'
delete extra css
delete
Merge pull request #64 from msmith7904/update_again

delete
new button stuff
Merge branch 'master' into new_button_stuff

Conflicts:
	app/views/sessions/new.html.erb