....
...
Merge branch 'master' of https://github.com/fastcatsearch/techmanual.git

Conflicts:
	Techmanual/.classpath
	Techmanual/.settings/org.scala-ide.sdt.core.prefs