Got rid of More Info button on Restaurant Selection and the Bill button
on the Pay Bill screen.
Merge remote-tracking branch 'upstream/master'
See commit messages. Fixed some styles and deleted some TODOs that were
hanging around.
Merge remote-tracking branch 'upstream/master'
Merge pull request #268 from espeo196/master

A few bug fixes and such.