Anjuta Project
Merge branch 'master' of https://github.com/ernest21/Plank-Config

Conflicts:
	.gitignore