màj 2 23-05-14
Merge branch 'master' of https://github.com/alxnyk013/vapor-alxnyk013

Conflicts:
	README.md