conventions
Merge branch 'develop' of https://github.com/nmaguirre/eiffel-2048 into develop