testing input page
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dashboard/views.py
	ProvoDashboard/urls.py
testing input page
adding DB
Merge remote-tracking branch 'origin/master'
Database Table
Database Table
Database Table
Database Table
Database Table
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/base.html