testing scala out
Adding for loop
Merge branch 'master' of github.com:jmrodri/alacs

Conflicts:
	.gitignore