working on template tutorial
working on template tutorial
working on template tutorial
working on template tutorial
Merge branch 'master' of https://github.com/ryanp424/TaskTrackerinator

Conflicts:
	inator/inator/urls.py
	inator/inator/urls.pyc
	inator/trackinator/admin.pyc
	inator/trackinator/urls.py
	inator/trackinator/views.py