Update Gemfile.lock for Heroku
Merge branch 'master' of heroku.com:alpha-bookmarking into rewrite-gemfile

Conflicts:
	Gemfile
	Gemfile.lock
Add rspec,guard, and spork
Finish static pages