Played with some javascript functions and elements,
began setting up project
Merge remote-tracking branch 'origin/master'

Conflicts:
	JSLab.js