Merge pull request #56 from cameronklein/NateUI

Nate ui
Merge pull request #57 from cameronklein/NateUI

Fixed some nagging UI bugs
Changed layout of launch screen, added vibration
Merge remote-tracking branch 'origin/master'
change formatting, clean things up a bit
Merge pull request #58 from cameronklein/CameronNew

Cameron new
App Icon
Merge branch 'master' into NateUI
UI Changes and an icon