Fixed the merge of all three JS bits
Updated Groups Page CSS
Merge pull request #33 from triathlonboy/master

Fixed the merge of all three JS bits
Merge remote-tracking branch 'ecomba/master'

Conflicts:
	views/list_of_groups.erb