uncommited changes
Merge branch 'development' of https://github.com/jessejohnson/flippy into development
corrected landscape views on two activities