Update virtual-machines-ruby-rails-web-app-linux.md

Fixing a typo. Not sure if you meant hosting or housing though?
Update virtual-machines-ruby-rails-web-app-linux.md

Another small typo relating to the port for the rails server.
trying to resolve conflict take 2
Merge pull request #1793 from tysonn/conflict4-17

trying to resolve conflict take 2
Add new screen shots from Karthika and remove existing ones
Reinstated text lost during reconciling merge conflicts
Merge pull request #1795 from KBDAzure/CreateVMEdits

Create vm edits
Add shots missed earlier, for How To Log On section.
Merge pull request #1796 from KBDAzure/CreateVMEdits

Add shots missed earlier, for How To Log On section.
Update virtual-machines-linux-how-to-log-on.md

Specified that the default user is "azuretest"
Adding more missing art
Merge pull request #1798 from KBDAzure/MissingArt

Adding more missing art
Update howto-connect-vm-cloud-service.md

Two broken links fixed, kept relative link although maybe it is safer to use full URL's i.e. http://azure.microsoft.com/en-us/documentation/articles/manage-availability-virtual-machines/
Fix formatting on two notes
Merge pull request #1801 from KBDAzure/FixNotes

Fix formatting on two notes
Merge pull request #1797 from kainam00/patch-1

Update virtual-machines-linux-how-to-log-on.md
Merge pull request #1800 from crisaldama/patch-1

Update howto-connect-vm-cloud-service.md
Merge pull request #1730 from gregstewart/patch-2

Update virtual-machines-ruby-rails-web-app-linux.md
fixing merge conflict
trying to fix merge