This shit is borken...
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/app/view4/view4.html
Merge branch 'master' of https://github.com/FrederikOlesen/Study-Point-System
Merge branch 'master' of https://github.com/FrederikOlesen/Study-Point-System
The dropdown menu now displays distinct classes.
You can now add and remove points on the fly, without force updating the page.
Merge branch 'master' of https://github.com/FrederikOlesen/Study-Point-System
The dropdown menu now displays distinct classes.
You can now add and remove points on the fly, without force updating the page.