added guard and spork. Cuz' we're guarrrrds...
Guardfile changes
Merge branch 'static-pages'

Conflicts:
	Gemfile.lock