added pretty button styles
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/activity_main.xml
This should put the cool green and black stuff in the app.
 final touches on style
Merge branch 'master' of https://github.com/jsaindon/sup
fixed merge conflict.