karma
Merge branch 'master' of https://github.com/ekinsigic/Limart

Conflicts:
	Styles/Misc.css