Manifesto
JSON
Database connectie
Merge remote-tracking branch 'origin/Jason'

Conflicts:
	AlmendeMotivator/.idea/workspace.xml
	AlmendeMotivator/AndroidManifest.xml
	AlmendeMotivator/out/production/AlmendeMotivator/AlmendeMotivator.apk
	AlmendeMotivator/out/production/AlmendeMotivator/AlmendeMotivator.unaligned.apk
	AlmendeMotivator/out/production/AlmendeMotivator/alm/motiv/AlmendeMotivator/Main.class
	AlmendeMotivator/out/production/AlmendeMotivator/alm/motiv/AlmendeMotivator/R$id.class
	AlmendeMotivator/out/production/AlmendeMotivator/alm/motiv/AlmendeMotivator/R$layout.class
	AlmendeMotivator/out/production/AlmendeMotivator/alm/motiv/AlmendeMotivator/R$string.class
	AlmendeMotivator/out/production/AlmendeMotivator/alm/motiv/AlmendeMotivator/R.class