Added another reroute
Updated user_info
Merge branch 'master' of github.com:civilivezation/Civilian