All the shit i've done
Add the remaining of the stuff i've made
Merge branch 'dynamodb' of github.com:sebashepin/cloudP1_rails3.2 into dynamodb
Merge branch 'master' into dynamodb

Conflicts:
	config/database.yml