second commit
Merge branch 'master' of https://github.com/jmenke/learning

Merging due to bad initial setup