vava
Merge branch 'master' of https://github.com/vanquangtoknow/Andrew

Conflicts:
	Checkin-Checkout/functions.txt
vdvv