testing

testing
Content provider and buttons
xmls and drawables
merged old branch
added gen folder to gitignore
merge
asdf