Merge pull request #10 from Lsargent/Trunk

Merge pull request #28 from Kholiway/Trunk
3/25

Profile displays all info
Merge pull request #29 from Kholiway/Trunk

Trunk