First Lego commit
Merge branch 'develop' of https://github.com/julesmercado/Lego into develop