Inital commit of proj-template
Merge branch 'master' of github.com:aswolf/proj-template

 - Initial merge of remote repo with local