fix
Merge branch 'master' of https://github.com/Quizer1349/wallapp

Conflicts:
	.idea/workspace.xml