Merge pull request #5 from CMPUT301F14T03/master

updaitng forkasdasdas
added an icon for attaching pictures in dialog box
Merge pull request #78 from tbrockman/master

Merging a little bit of .xml tweaking