page2-2
Merge branch 'master' of github.com:collabee/collabee

Conflicts:
	public/stylesheets/style.css