Simplification.
Adding .gitignore.
Merge branch 'stage-1-solution' into stage-2-solution