css update
Merge branch 'master' of https://github.com/ewelaryba/Makapen
merging changes
changes to stylesheet