before pull
Merge branch 'master' of https://github.com/thumbtack-technology/training-2013-page-indexer
Merge branch 'master' of https://github.com/thumbtack-technology/training-2013-page-indexer
before merge
Merge branch 'master' of https://github.com/thumbtack-technology/training-2013-page-indexer

Conflicts:
	src/test/java/net/thumbtack/training/pageIndexer/test/indexing/IndexerTests.java