Changed framework from Django to Bottle as temporary prototype.
Fix merge conflict.