Changes Made to UI
Merge remote-tracking branch 'upstream/master'
merge conflict resoleved
Merge remote-tracking branch 'upstream/master'
PLEEESE MERGE
Merge remote-tracking branch 'upstream/master'
Merge pull request #25 from candyforchris/master

PLEEEEESSEE