alert box in login page for both signin and register
alert box in login page for both signin and register
made the homepage
slight changes to the homepage
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
calendar file
update app.js
Merge pull request #51 from CSc436/homepage

Homepage reviewed by Zach
moved angular.min.js file and modified calendar
swapped schedule.init params
Merge branch 'COcalendar'

Conflicts:
	site/app/js/app.js
Fixed calendar bug in app.js
Merge pull request #54 from CSc436/fixBugCal

Fixed calendar bug in app.js
.