try to add button
Merge branch 'master' of github.com:atregubenko/hackday

Conflicts:
	app/src/main/java/devfest/hack/day/materialdemo/MainActivity.java
Merge branch 'master' of github.com:atregubenko/hackday