Finishing #579
Merge branch 'master' of github.com:GabrielDancause/blobon
Worked on new templates