Final checkin before cakeification.

Signed-off-by: Woody NaDobhar <woodynadobhar@gmail.com>
Merge branch 'master' of github.com:WoodyNaDobhar/techII

Conflicts:
	img/logo2.png
	index.htm