4st commit
Merge branch 'master' of https://github.com/darkofmarin/aras

Conflicts:
	Text.txt