Initial commit
Merged Github default with template project