razzledazzle
lets try this again
So many things to add
Adding the boxfile
Changed README
More README fixes
More README love
Updated to Laravel 3.2.5
Merge pull request #1 from msurguy/master

Updated the base to Laravel 3.2.5
yo
Merge branch 'master' of git.pagodabox.com:tan-tatyana-02

Conflicts:
	Boxfile
	application/bundles.php
	application/config/.gitignore
	application/config/application.php
	application/config/auth.php
	application/config/cache.php
	application/config/database.php
	application/config/error.php
	application/config/mimes.php
	application/config/session.php
	application/config/strings.php
	application/controllers/base.php
	application/controllers/home.php
	application/language/en/pagination.php
	application/language/en/validation.php
	application/libraries/.gitignore
	application/migrations/.gitignore
	application/models/.gitignore
	application/routes.php
	application/start.php
	application/tasks/.gitignore
	application/tests/example.test.php
	application/views/error/404.php
	application/views/error/500.php
	artisan
	bundles/.gitignore
	laravel/asset.php
	laravel/auth.php
	laravel/autoloader.php
	laravel/blade.php
	laravel/bundle.php
	laravel/cache.php
	laravel/cache/drivers/apc.php
	laravel/cache/drivers/database.php
	laravel/cache/drivers/driver.php
	laravel/cache/drivers/file.php
	laravel/cache/drivers/memcached.php
	laravel/cache/drivers/memory.php
	laravel/cache/drivers/redis.php
	laravel/cli/artisan.php
	laravel/cli/command.php
	laravel/cli/dependencies.php
	laravel/cli/tasks/bundle/bundler.php
	laravel/cli/tasks/bundle/providers/github.php
	laravel/cli/tasks/bundle/providers/provider.php
	laravel/cli/tasks/bundle/publisher.php
	laravel/cli/tasks/bundle/repository.php
	laravel/cli/tasks/key.php
	laravel/cli/tasks/migrate/database.php
	laravel/cli/tasks/migrate/migrator.php
	laravel/cli/tasks/migrate/resolver.php
	laravel/cli/tasks/migrate/stub.php
	laravel/cli/tasks/route.php
	laravel/cli/tasks/session/manager.php
	laravel/cli/tasks/session/migration.php
	laravel/cli/tasks/task.php
	laravel/cli/tasks/test/phpunit.php
	laravel/cli/tasks/test/runner.php
	laravel/cli/tasks/test/stub.xml
	laravel/config.php
	laravel/cookie.php
	laravel/core.php
	laravel/crypter.php
	laravel/database.php
	laravel/database/connection.php
	laravel/database/connectors/connector.php
	laravel/database/connectors/mysql.php
	laravel/database/connectors/postgres.php
	laravel/database/connectors/sqlite.php
	laravel/database/connectors/sqlserver.php
	laravel/database/eloquent/model.php
	laravel/database/eloquent/pivot.php
	laravel/database/eloquent/query.php
	laravel/database/eloquent/relationships/belongs_to.php
	laravel/database/eloquent/relationships/has_many.php
	laravel/database/eloquent/relationships/has_many_and_belongs_to.php
	laravel/database/eloquent/relationships/has_one.php
	laravel/database/eloquent/relationships/has_one_or_many.php
	laravel/database/eloquent/relationships/relationship.php
	laravel/database/exception.php
	laravel/database/expression.php
	laravel/database/grammar.php
	laravel/database/query.php
	laravel/database/query/grammars/grammar.php
	laravel/database/query/grammars/mysql.php
	laravel/database/query/grammars/sqlserver.php
	laravel/database/query/join.php
	laravel/database/schema.php
	laravel/database/schema/grammars/grammar.php
	laravel/database/schema/grammars/mysql.php
	laravel/database/schema/grammars/postgres.php
	laravel/database/schema/grammars/sqlite.php
	laravel/database/schema/grammars/sqlserver.php
	laravel/database/schema/table.php
	laravel/error.php
	laravel/event.php
	laravel/file.php
	laravel/fluent.php
	laravel/form.php
	laravel/hash.php
	laravel/helpers.php
	laravel/html.php
	laravel/input.php
	laravel/ioc.php
	laravel/lang.php
	laravel/laravel.php
	laravel/log.php
	laravel/memcached.php
	laravel/messages.php
	laravel/paginator.php
	laravel/pluralizer.php
	laravel/redirect.php
	laravel/redis.php
	laravel/request.php
	laravel/response.php
	laravel/routing/controller.php
	laravel/routing/filter.php
	laravel/routing/route.php
	laravel/routing/router.php
	laravel/section.php
	laravel/session.php
	laravel/session/drivers/apc.php
	laravel/session/drivers/cookie.php
	laravel/session/drivers/database.php
	laravel/session/drivers/driver.php
	laravel/session/drivers/file.php
	laravel/session/drivers/memcached.php
	laravel/session/drivers/memory.php
	laravel/session/drivers/redis.php
	laravel/session/drivers/sweeper.php
	laravel/session/payload.php
	laravel/str.php
	laravel/uri.php
	laravel/url.php
	laravel/validator.php
	laravel/view.php
	license.txt
	paths.php
	public/.htaccess
	public/bundles/.gitignore
	public/css/.gitignore
	public/img/.gitignore
	public/index.php
	public/js/.gitignore
	readme.md
pagoda base
back to original
back to original
db change
db change
better tag completion