styling
Merge branch 'master' of github.com:nadvamir/GU2013-IS3