Added ViewModel functionality
Merge branch 'master' of https://github.com/Minjammben/CUPterodactyl

Conflicts:
	js/main.js