elements
source file
Merge branch 'master' of github.com:konradrodzik/AND2IOS

Conflicts:
	alayoutfile.cpp
	main.cpp