Working on Creating templates
Merge branch 'master' of https://github.com/redatomstudios/GAO