push test
Merge branch 'master' of https://github.com/Assiance/Observer

Conflicts:
	.gitignore