Simplified the SiteUser to only have Username, email, and password
Merge pull request #42 from CSc436/41SiteUserChange

Simplified the SiteUser to only have Username, email, and password
Added a populate file to give sample data into the database
Fixed pep8
Changed Workout representation to show username
Merge pull request #44 from CSc436/43AddSampleData

Added a populate file to give sample data into the database
Merge branch 'master' of https://github.com/CSc436/gymjournals into Zach-nav

Conflicts:
	gymjournals/apps/user/models.py