Clean up template and start Problem Definition
Merge branch 'master' of github.com:KapSteR/TiNONS