Add Guard, Spork to testing suite
Changed .gitignore, remove Gemfile.lock
Did not commit .gitignore earlier, now committing
Merge branch 'static-pages'

Conflicts:
	Gemfile.lock
Reinit Gemfile.lock through bundle install