askaway/askaway — pull request #63 by jonlemmon (2014-06-19 03:48:50+00:00)
Title: Questions page styles

hey guess what @meghowie, no merge conflicts!

how did you try to merge in master? `git pull origin master` into your branch is the most fail-safe way.