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