create user
resolve confict
Merge branch 'master' of https://github.com/lftechnologyinc/hack_codejammers