Initial commit with working program
Merge origin/master