Addition of bootstrap.css and bootstrap.js
images/index view added. Image and Album models fixed. ImageAlbum relation model created. Single line is commented out on application_controller.rb since it was causing a problem
Merge pull request #37 from aboccieri/master

Addition of bootstrap.css and bootstrap.js
Merge pull request #38 from myildirim/master

Added images/index view with other changes and fixes
Fixed the configure_permitted_parameters in application_controller - typo.
Added view question
change
add style to post's view
View added for editing of user profile.
View added for editing of user profile.
Merge branch 'master' of https://github.com/erboyle/snapp into erboyle-master

Conflicts:
	app/controllers/application_controller.rb
Merge branch 'master' of https://github.com/Sunnygolden8/snapp into Sunnygolden8-master

Conflicts:
	app/assets/javascripts/bootstrap.js
	app/assets/stylesheets/bootstrap.css
	app/controllers/posts_controller.rb
Merge pull request #41 from alexabreu/master

View added for editing of user profile.
Merge branch 'master' of https://github.com/lnolson/snapp into eventsViews

Conflicts:
	app/assets/stylesheets/bootstrap.css

Add event edit/new views
add event edit/new views
ADD EVENTS FORM
gr4eat jov
Merge remote-tracking branch 'origin/eventsViews'

Conflicts:
	Gemfile
	Gemfile.lock
merge events branch