MyBookings started!
Merge branch 'master' of https://github.com/SirCAS/MakerLabApp

Conflicts:
	App/.idea/workspace.xml