student information added
student information added
enrolling in cs100
Merge pull request #146 from mxu008/cs100-2014fall

enrolling in cs100
Merge pull request #147 from jinsongwei/cs100-2014fall

enrolling in cs100
change master to ucr-cs100
Update README.md
Merge pull request #148 from mxu008/cs100-2014fall

I just update README.md
fixed scripts
added instructor Taeyoung Kim <tkim049@cs.ucr.edu> to class
fixed bug
Updated hw READMEs
Missed the hw labels in the instructions above the code snippet.
Merge pull request #149 from jhollister/cs100-2014fall

Updated hw READMEs
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
Test file
Removed Test file
Create fvera002
Edit small code error

changed std:::cout --> std::cout
Merge pull request #154 from rtran012/patch-1

Edit small code error