commit changes Stephany Park
Merge branch 'master' of https://github.com/stevemcquaid/cmunity

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/bootstrap_and_overrides.css.less
Resolving Merge Conflicts
Added logo
commit changes on views and a new logo
Merge branch 'master' of https://github.com/stevemcquaid/cmunity

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/home.css.scss
	app/views/layouts/application.html.erb
changed views
Initial commit for activity tracking
Merge branch 'master' of https://github.com/stevemcquaid/cmunity
Merge branch 'master' of https://github.com/stevemcquaid/cmunity
Fixed encrypted password error
Created seed file to work with devise. activity tracking working for TextPost create action
Merge branch 'sean' of github.com:stevemcquaid/cmunity

Conflicts:
	app/models/user.rb
Updated various views and controllers to not error on nil date_created/ date_modified. Removed all referenced to date_created / date_modified

-Steve
Merge pull request #18 from stevemcquaid/steve

Removed date_created & date_modified to prevent nil errors
Merge branch 'master' of https://github.com/stevemcquaid/cmunity
added index static (css, html)
updates to user model unit tests
Merge branch 'steve' into stephany