changes
Merge branch 'master' of https://github.com/fatface/FreelaProject

Conflicts:
	.classpath