Merge pull request #2 from nathanhood/user

login complete
create test finished
registration edit
design merge resolutions
registration fixed - image and username included
current courses added to User
Merge pull request #6 from nathanhood/content

Content
got user profile working