updates
Merge branch 'master' of https://github.com/Zakkeri/DNA_Simulator

Conflicts:
	Headers/AssemblyTile.h
	Source/AssemblyTile.cpp