Initial commit

Signed-off-by: jpgilchrist <james.p.gilchrist@gmail.com>
fixed merge conflict on .gitignore