merging
Merge branch 'master' of github.com:corydominguez/gator-android

* 'master' of github.com:corydominguez/gator-android:
  Modifying the marked and unmarked icons
added non functioning tabs and did some styling