Users have lists
Users can add and remove services to/from lists
Guest cannot see more info
Gemfile
Merge branch 'development'

Conflicts:
	app/views/home/index.html.haml

merging with master
Merged and resolved conflicts
Resolved merging conflicts