First Commint
Merge branch 'master' of github.com:cmeraz/vigtrucking

Conflicts:
	.gitignore

 On branch master
 Changes to be committed:

	modified:   .gitignore
	new file:   LICENSE
	new file:   README.md