Initial commit
Implements Flask framework
Merge conflict fix