user and user_private models are added
user and user_private models are added
Merge branch 'master' of github.com:pranavhuchche/office_automation

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	bin/bundle
	bin/rails
	bin/rake