return two values
Merge pull request #9 from Fitzclutchington/master

starting bootstrap for student html page
Merge pull request #10 from mk200789/master

return two values
- User resgistration and login works now
merge
Merge remote-tracking branch 'upstream/master'
Merge pull request #12 from mk200789/master

merge
Merge remote-tracking branch 'upstream/master'
Fixed merge conflicts

Conflicts:
	app/db.sqlite3
Merge pull request #13 from lsxliron/master

Fixed merge conflicts
minor change for studentinfo column name
Merge remote-tracking branch 'upstream/master'
.gitignore: Ignoring database file
Merging
Removing all .pyc files
added skeleton of instructor page
Merge pull request #14 from mk200789/master

minor change is list_display for column name
Merge pull request #15 from ian-s-mcb/master

added skeleton of instructor page
student view added panels