fixed syntax error on line 9
Merge branch 'master' of https://github.com/JAWA21/markularity

Conflicts:
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_file_map