move alias field to user table
Merge branch 'master' of github.com:sola92/ECE358-Project