Merge branch 'master' of C:\Users\Shahar\AndroidStudioProjects\InforMeRyerson with conflicts.
ios banner thing