working with templates
Merge branch 'master' of https://github.com/mohamedkomalo/nyuad_hack