change default behavior
Merge branch 'master' of github.com:AlejoFernandez/hack-a-thon