Initialized Django Project
Merge remote-tracking branch 'origin/master'
648pm 3/5/2014
814pm 3/5
439pm 3/7/2014
439pm 3/7/2014
Moved front end to /main/templates/main, following Django standard
change template to templates
..
Inserted Django template language
Added template language
Added template language to js
changed static js to django js