Cleaned up conflicts/jQuery issue in header
Merge branch 'master' of https://github.com/tsaxton/datatrack

Conflicts:
	includes/css/datatrack.css