Big commit, big commits are bad
Merge branch 'master' of github.com:smashingboxes/war-general