added Album model
no message
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.
Added Follow Model
Merge pull request #35 from TianaFC/master

Added Follow Model
Generated Events controller
Events controller updated
Merge pull request #36 from rdmaloney92/master

Events Controller
Addition of bootstrap.css and bootstrap.js