Merge remote-tracking branch 'upstream/master'
Create Users controller
fix conflict with schema.rb
Merge pull request #23 from rpandey1234/master

Add user profile page