This is a commit

a commit
Merge branch 'master' of http://github.com/mopdog/mopdog_v2

Conflicts:
	header.php
	less/master.less
Removed comment code