Merge branch 'master' of https://github.com/lnolson/snapp
Merge branch 'master' of https://github.com/lnolson/snapp
Merge pull request #1 from lnolson/master

Group Controller add
added Album model
Merge branch 'master' of https://github.com/lnolson/snapp
no message
added the extra files created for the groups controller
Merge branch 'master' of https://github.com/Zoantharian/snapp
Created Image Model

Began implementation of carrierwave gem
Added Dislike model
Database.sample edit
Added the comment model. Belongs to user
Merge pull request #29 from maribelb/master

added Album model
Merge pull request #30 from Zoantharian/master

groups controller extra files
Merge pull request #31 from Spiris/master

Another pull request for the post controller
Merge pull request #33 from albab/master

Created Dislike model
Merge pull request #34 from macisne1/master

Added the comment model. Belongs to user
Merge branch 'master' of https://github.com/matthewjbriggs/snapp into matthewjbriggs-master

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
Merge branch 'matthewjbriggs-master'
restore database.sample.