Merge pull request #13 from hoongman/master

can now post messages to a group
Merge pull request #14 from hoongman/master2

merged last C&V commit with last K&S commit
sign_up.feature passed
commit with sign up 18.27 14.05.13
sign up progress 18.37 14.05.13
sign up completed maybe
Merge pull request #15 from KeirOsborn/master

Sign up page completed maybe
Tidied up the collaborator.rb file, whilst also splitting out the _spec files. No code added just arrangements.
merging latest fetch before pushing
Merge pull request #16 from triathlonboy/master

Hey Enrique Sir. I have taken some time to tidy the code base up. No conflicts to report
Put some more makeup on the site with CSS and some Flat UI
Merge pull request #17 from triathlonboy/master

Put some more makeup on the site with CSS and some Flat UI
test commit
Merge remote-tracking branch 'ecomba/master' into master2

Conflicts:
	features/login.feature
	lib/collaborator.rb
	spec/collaborator_spec.rb
	views/group_timeline.erb