Merge pull request #1 from Lsargent/Trunk

Trunk
Merge pull request #2 from Lsargent/Trunk

3/6/2013
Merge pull request #3 from Lsargent/Trunk

Trunk
Wat we did in the lab
Merge pull request #9 from Kholiway/Trunk

Trunk