ok changed
asd asd asd
Merge branch 'master' of https://github.com/voris90/jstore

Conflicts:
	index.html