error in syncing, do not mind this
Merge remote-tracking branch 'origin/master'

Conflicts:
	QueueWebApp/build/web/Thumbs.db ** REMOVED **
Merge branch 'master' of https://github.com/Barbie-Queue/Thesis-Queuing-System