minor change for studentinfo column name
Merge remote-tracking branch 'upstream/master'
.gitignore: Ignoring database file
Merging
Removing all .pyc files
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
-Added notification page to send notification. Not implemented yet
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
Merge pull request #16 from lsxliron/master

-Added notification page to send notification. Not implemented yet
removed database from commit
Merge pull request #17 from lsxliron/master

removed database from commit
send_sms.py: Updating sms script
view.py: Updating views.py
views.py: Updating imports
student view added panels
Merge branch 'master' of github.com:DrkSephy/lehman-hackathon
Merge pull request #18 from Fitzclutchington/master

Added panels