Started on current menu view
Merge branch 'master' of github.com:jsh0rty/IProgLab4

Conflicts:
	index.html