Initial commit
Commit before github sync
resolved git conflicts