ignore style.css as this is part of the build process; master, however, will need to allow committing of this file
Merge branch 'develop' into feature-markup