Pinterest style layout for recipes
Merge branch 'master' of https://github.com/viv-liu/cloaked-octo-hipster (resolve conflicts)

Conflicts:
	gen/com/example/android/effectivenavigation/R.java
	src/com/example/android/foodstorm/MainActivity.java