Merge pull request #1 from BYUS-INC/master

Ignore Files Added
Merge pull request #2 from BYUS-INC/master

Travis build file merge
Travis image
Update README
Update README
Merge branch 'master' of https://github.com/BYUS-INC/java-carracoo into BYUS-INC-master

Conflicts:
	README
Merge pull request #1 from casser/master

merge from casser