jaykon_changes branch created
Merge commit 'f75f4dab8fc8a3c7109408a25c985857a841a864'

Conflicts:
	index.html
	js/main.js
Added frame “page”
Updated merged main.js file
Fixed Bus resolution