this time we really fixed the tests...honest
this time we really fixed the tests...honest
resolved conflicts with merge
Merge remote-tracking branch 'ecomba/master' into master3
Merge remote-tracking branch 'ecomba/master' into master3
first commit to heroku
changed yml file for heroku
changed yml file for heroku
first draft on heroku
first working draft
warning message added when deleting groups
Merge remote-tracking branch 'ecomba/master' into master3

Conflicts:
	lib/mongoid.yml
typo fixed
Merge remote-tracking branch 'ecomba/master' into master3
Created relationship with user and groups
Hello
Merge remote-tracking branch 'Enrique/master'
Half way through hacking the like button
Merge pull request #29 from hoongman/master3

Validation applied on deleting groups which contain posts
Tidying up the HTML semantics