Merge pull request #4 from n2diving/hamitron

Hamitron
Bootstrap, 12_factor
Merge resolve
added lessons controller