Revert "sql connectie :P"

This reverts commit dc4ca3667bd2ce417bce328ae5d8f4d5489ab029.
Revert "Revert "sql connectie :P""

This reverts commit ae32e6123778f87119ae8b9f8f48785f46ff30fb.
Revert "Revert "sql connectie :P""

This reverts commit ae32e6123778f87119ae8b9f8f48785f46ff30fb.
Merge remote-tracking branch 'origin/master'

Conflicts:
	FYSApp-master/src/fysapp/FYSApp.java
Merge branch 'master' of https://github.com/Buggyy/FYSApp