merge
Merge branch 'master' of https://github.com/Orrexon/Totemic2014

Conflicts:
	Totemic.sdf