Merge pull request #57 from InebriatedSquirrel/master

Merge franciscomap
Merge pull request #58 from InebriatedSquirrel/DesignTeam

Merge pull request #57 from InebriatedSquirrel/master