Deleted file
Merge branch 'master' of github.com:astarael7/sample_app into updating-users