bookmark
bookmarks
Merge branch 'gh-pages' of ssh://github.com/aumberg/slovastick into gh-pages
Merge branch 'gh-pages' of ssh://github.com/aumberg/slovastick into develop

Conflicts:
	index.html
	slovastick.js
link