Merge remote-tracking branch 'upstream/master' into layoutSelector
Merge remote-tracking branch 'upstream/master' into layoutSelector
course creation html?
Merge remote-tracking branch 'upstream/master' into layoutSelector
add teacher id
adding courses with a course page
Fixed registration authentication bug and checks if username is already registered
Merge branch 'master' of https://github.com/travisreed-wf/494Sandbox
Login prompt if username/password is incorrect. Changed to ajax call instead of form submission
Merge pull request #2 from ISUWebPortal/master

update
course creation working
remove host
Merge pull request #13 from travisreed-wf/layoutSelector

Course Creator (frontend)
Say how to register
Merge branch 'master' of https://github.com/travisreed-wf/494Sandbox
Real Data

Class List now pulls in real data in home page
Merge pull request #3 from ISUWebPortal/master

Travis update
Merge branch 'master' of https://github.com/jdmielke/491Project

Conflicts:
	src/models.py
Merge pull request #14 from AJH693/master

updated Registration stuff
on logout

No longer displays email when logged out.