Merge pull request #3 from chrysa/master

reset master
Merge pull request #4 from chrysa/junior

Merge pull request #3 from chrysa/master