merge conflict
Merge branch 'master' of github.com:ericirel/Xplor
Merge fix
Merge fix
merge conflict
Users can now post, user have post history