commit
Merge branch 'master' of https://github.com/Crystalnix/stroustrup into Django_Templates
Merged frontend 'n' backend
Merged frontend 'n' backend
finish this