IvanaE e50c681d54 Merge branch 'DBBranch'		2018-11-28 13:13:13 -05:00
..
java/com/uottawa/olympus/olympusservices	Fixed some bugs and added comment to rating	2018-11-27 11:37:53 -05:00
res	added comment to ui	2018-11-28 13:11:37 -05:00
AndroidManifest.xml	combined booking classes	2018-11-23 14:51:40 -05:00
ic_launcher-web.png	added logo	2018-10-18 12:32:21 -04:00