Sync awsome
Conflict fix

Conflicts:
	.gitignore