finished user end w/o ajax
Merge pull request #2 from ctogden/jamie

finished user end w/o ajax