test

function azlan
Merge branch 'master' of https://github.com/adisoe/foursquare

Conflicts:
	login.php