Merge pull request #13 from Crystalnix/Django_Templates

Django templates
Test commit
test commit
test commit #2