still having gitignore problems
Merge branch 'master' of https://github.com/MLHRD/tvet

Conflicts:
	tvet/tafe/static/images/kit-header.jpg
	tvet/tafe/templates/admin/base_site.html
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet
Merge branch 'master' of https://github.com/MLHRD/tvet