ignore meta-inf
Merge branch 'master' of https://github.com/ganzm/AdvancedSystemsLab2013

Conflicts:
	.gitignore