Merge branch 'aidev' of https://github.com/HAW-AI/IS-2013-SS-A3-DLFH-Paletto into aidev
Merge branch 'aidev' of https://github.com/HAW-AI/IS-2013-SS-A3-DLFH-Paletto into aidev