untracked Gemfile.lock
Merge branch 'master' of github.com:sh0w/serendipity

Conflicts:
	Gemfile.lock
	Capfile
	.gitignor
	merge.rb
	photo.rb
	sessions_spec.rb
	edit.html.haml_spec.rb
	index.html.haml_spec.rb
	new.html.haml_spec.rb