added user controller functionality
fixed conflicts
added user register and store functionality
finished register and stor user functions
deleted old file
Merge pull request #10 from mcoelho/master

User Functionality