added local
Merge branch 'master' of github.com:lapator/remote

Conflicts:
	1