Merge branch 'master' of https://github.com/apontecolina/Hackaton
Merge branch 'master' of https://github.com/apontecolina/Hackaton
clean up