dan
Merge branch 'master' of https://github.com/ebcayabyab/cs197-Iskolarship

Conflicts:
	backend/database.pyc
	backend/models.py
	backend/models.pyc
	backend/models.py~
	backend/server.py
	backend/server.py~
	frontend/build/html/dan.jade~
	frontend/build/index.html
	frontend/build/index.jade~
	frontend/src/index.jade
	frontend/src/index.jade~