Laz: committed first time
Merge branch 'master' of https://github.com/TonsOfLaz/calhoun-architecture