First commit with basic templates.
Merged new remote repo and fixed conflict.