proto.
Merge branch 'master' of https://github.com/jmesmon/trifles

Conflicts:
	ideas.txt