removed some files that should be ignored??
index
initial aws s3 upload integration..... currently working with personal s3 account
more shtuff
Merge branch 'development' into ninnah
stuff
imore work on image upload
......
...
adding autoload config file to repo because that will have branch specific configuration independent of environment
lkjl;kj
finally mostly finished the s3 upload, just need to finish testing migration script and speeds, unable to do that on galvanize internet lol
final tweaks
Merge branch 'development' into ninnah
adjusted the .gitignore file to include files that aren't environment specific
Merge branch 'development' into ninnah

Conflicts:
	app_havenly/config/autoload.php
	app_havenly/models/rooms_model.php
	app_havenly/views/customer/my_concepts.php
	app_havenly/views/customer/my_designs.php
	app_shopthisroom/config/database.php
Merge pull request #3 from ellemot/ninnah

Amazon S3 Uploads Ninnah