javascript hookup
Merge branch 'master' of https://github.com/davidteofilovic/CS275

Conflicts:
	order.php