initial commit
forgot git add .
Fixed merge conflict
Merged dev for Travis
Merge pull request #19 from Label305/feature_input-tel

Feature input tel