changes for bugs
Merge branch 'master' into first_ms_bugs

Conflicts:
	app/assets/stylesheets/home.css.scss
	app/models/ability.rb
Merge pull request #111 from deepak496/first_ms_bugs

changes for bugs