First commit
Added travis.yml file
Merge branch 'master' of github.com:alexebube/webapp

Conflicts:
	.gitignore