Update README.md
initial commit
fixed merge conflict
fixed formatting errors
created user models
added basic user model and controller
Merge branch 'Jason' of https://github.com/IDSGPlayground/idsgWebsite into Jason
updated logs and cache
merged Jason branch with master