temp commit
Merge branch 'master' of https://github.com/masya/hookupRepo

Conflicts:
	hookup/res/values/styles.xml