recovery
pulling master to fixingit branch
added all extra page templates
added assets back into file