week2 init
Merge branch 'development' of https://github.com/vertz/m101p into development