1st Upload - Basic funtionality
Merge branch 'master' of https://github.com/anjj/TafallaTO