fresh working
user reg done
register feature complete
Merge branch 'register'