finished designing the app, now onto making it look pretty.
Merge remote-tracking branch 'origin/master'