Fixed URL
Yearly and daily view
Merge branch 'master' of https://github.com/syoder15/CS98GroupProject

Conflicts:
	cs98jam/jam/templates/swingtime/daily_view.html
	cs98jam/jam/templates/swingtime/yearly_view.html