User model added
Merge branch 'master' of github.com:rishijain/rubyinsense

Conflicts:
	Gemfile.lock