Add Spork and Guard
Merge branch 'master' of github.com:Jberczel/sample_app

Conflicts:
	Guardfile