video upload iets
Merge branch 'master' of https://github.com/Avans-Everyware-42IN11EWe/Everyware-IOS-app

Conflicts:
	GlasAanHuis/Base.lproj/Main.storyboard
Merge branch 'master' of https://github.com/Avans-Everyware-42IN11EWe/Everyware-IOS-app