Merge branch 'master' of github.com:afitterling/rails4base
Merge branch 'develop' of github.com:afitterling/rails4base
Merge branch 'master' of github.com:afitterling/rails4base
Merge branch 'develop' of github.com:afitterling/rails4base
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'develop' of github.com:afitterling/rails4base
Merge branch 'refs/heads/develop'
Merge branch 'develop' of github.com:afitterling/rails4base
README
Merge branch 'refs/heads/develop'
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	README.md
README
README
cache
cache
README
installation specific setup
mailer domain
example