fixed and updated index view. cache is giving me problems again, bro
Merge branch 'master' of https://github.com/JAWA21/markularity

Conflicts:
	app/tmp/cache/cake_toolbar_cachee41137025a9e864dce58d2d3ba2cc19c
	app/tmp/cache/models/myapp_cake_model_default_markularity_bookmarks
	app/tmp/cache/models/myapp_cake_model_default_markularity_list
	app/tmp/cache/models/myapp_cake_model_default_markularity_users
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_cake_en-us
	app/tmp/cache/persistent/myapp_cake_core_debug_kit_en-us
	app/tmp/cache/persistent/myapp_cake_core_default_en-us
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log