deleted from master testfile
?
Merge branch 'master' of github.com:vedranbilanovic/sample_app