Edited README with the following changes:
1. Modified first main.cpp example. Changing iostream.h to iostream. Including iostream.h is deprecated and will not compile in g++.
2. Modified the example code for merging the branches bugfix, master, and userinput. Changing return 1; to return 0;. Not doing so would of put the code back into a bugged state.
Merge pull request #150 from KenleyArai/cs100-2014fall

Found minor bugs in lab1-git README