index on master: ad26983 Merge pull request #27 from joemariedimzon/master
WIP on master: ad26983 Merge pull request #27 from joemariedimzon/master
Merge commit 'stash'

Conflicts:
	eappi/theme/static/rules.xml