Client Changing (old) must commit before sync
Merge branch 'master' of https://github.com/pas0185/RIP

Conflicts:
	index.html
?