Merged and pulled javascript into .js files.
Merge branch 'addJinja' of github.com:kpaskov/SGDFrontend into addJinja