done adding cards
userlist function
Merge branch 'google_charts' into simplify_gamal

Conflicts:
	app/views/main.php
deleting file