css/style.css changed
Merge branch 'master' of https://github.com/amolc/gigster2

Conflicts:
	css/style.css