updated
Merge branch 'master' of https://github.com/jas0n-/hashBubble

Conflicts:
	Frontend/hashBubble.html