Tweak
Merge pull request #20 from eas604/master

Tweaks
Screen adjust
Merge pull request #27 from TEAM2-ISC567-FALL14/master

Crikey, cutting it close here. :P