stuff
stuff two
Merge branch 'master' of github.com:gdomingu/learnbystory
fixed strange errors