Merge branch 'release/1.0.3'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 21:20:08 +0000 (17:20 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 21:20:08 +0000 (17:20 -0400)
Conflicts:
style.css


Trivial merge