Base theme.
Merge pull request #1 from vml-akoebbe/master

Empty Base Theme
Base theme cleanup
added compass-normalize
Merge pull request #2 from vml-akoebbe/master

cleanup and normalize
Merge pull request #1 from Zarabadoo/master

Pulling theme updates down
Added a geolocation frontend script
Included geoloc JS in theme
Merge branch 'master' of github.com:japerry/Drupal4OK
Merge branch 'master' of github.com:Zarabadoo/Drupal4OK
added formalize and called it into screen.scss
Move theme to new directory stucture
Merge pull request #3 from vml-akoebbe/master

Move theme to new docroot structure
Merge branch 'master' of https://github.com/Zarabadoo/Drupal4OK into Zarabadoo-master
merge upstream changes
Moved geoloc script
Merge pull request #4 from vinmassaro/master

Added formalize
Merge pull request #2 from Zarabadoo/master

Change dir structure
Merge branch 'housing' of https://github.com/Zarabadoo/Drupal4OK into Zarabadoo-housing

Conflicts:
	docroot/sites/all/themes/drupal4ok/drupal4ok.info
	docroot/sites/all/themes/drupal4ok/stylesheets/css/screen.css
	docroot/sites/all/themes/drupal4ok/stylesheets/sass/partials/_base.scss
	docroot/sites/all/themes/drupal4ok/stylesheets/sass/screen.scss
Merge pull request #3 from Zarabadoo/housing

Pull in Housing
Ride Request and base person information features.