Merge branch 'master' of C:\Users\Shahar\AndroidStudioProjects\InforMeRyerson with conflicts.
Added Scrolling to the front tutorial
No Proguard