Working
stupid
Merge branch 'master' of https://github.com/flysaiah/Busker-database

Conflicts:
	buskerdb.db
Modified views.py to incorporate separate landing pages