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
Merge branch 'master' of https://github.com/stevemcquaid/cmunity
Merge branch 'master' of https://github.com/stevemcquaid/cmunity
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