merge
Merge remote-tracking branch 'upstream/master'
Merge pull request #12 from mk200789/master

merge
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
Moving scripts into hack/ folder
Merging
Fixed merge comnflict

Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/app/urls.pyc
	app/hack/admin.pyc
	app/hack/models.pyc
	app/hack/views.pyc