Initial commit
Merge with github boilerplate