Initial commit
basic scaffolding
gitignore merge