Add documentation to aws.rb concern
Add docs for provider.rb
Add cloud comments
Update README.md
How to create an instructor machine
Merge branch 'master' of github.com:edurange/edurange
yaml code for scenarios
Public IP
Merge branch 'master' of github.com:edurange/edurange
Rename scenarios -> scenarios-yml
Merge branch 'master' of git://github.com/milescrabill/edurange into milescrabill-master

Conflicts:
	app/models/concerns/aws.rb
	app/views/instances/show.html.haml
Merge branch 'milescrabill-master'
instructors manual
instructor manual
Incomplete merge, apologies
scenarios -> scenarios-yml
Add name lookup hash in order to support multiple scenarios of same name
merged in stefan's recent changes