commit 2
Merge branch 'master' of https://github.com/arielcalcano/as_test

Conflicts:
	file test.txt
Merge branch 'master' of https://github.com/arielcalcano/as_test

Conflicts:
	file test.txt