test
Merge branch 'master' of https://github.com/nicholashaydensmith/cruzcal into chase

Conflicts:
	models/table.py
Merge branch 'master' of https://github.com/nicholashaydensmith/cruzcal into chase

Conflicts:
	views/default/index.html
changes
Merge branch 'master' of https://github.com/nicholashaydensmith/cruzcal into chase
added stuff
added functions to get tag relations and timing conflicts
merged with master