push before computer dies
Merge branch 'master' of github.com:JessicaG/slice_works_clone

Conflicts:
	lib/app.rb