.
Merge branch 'dev' of https://github.com/JustinXyrel/restaurant_app into dev