html controller added
added bootstrap layout
continuing with guest
working on rubyracer issue
conflict resolved
working on migration issue
Merge branch 'develop' of github.com:railsrumble/r13-team-303 into develop
continuing with guest
added guest user functionality
bootstrap added
Merge branch 'develop' of github.com:railsrumble/r13-team-303 into develop
refactored guest code
removed conflict
removed conflict
1. update the .gitignore file
2. cloud provider resources added using scaffold
3. fog and rails_config added
Remove conflicts came from above
Merge branch 'develop' of github.com:railsrumble/r13-team-303 into develop

Conflicts:
	Gemfile.lock
getting the latest changes
capistrano added
1. Added migration to add type field in cloud provider mode
2. Aws and Rackspace sub model added under cloud provider model
3. Added recursive auto load path for  subclasses
added live validations