Initial classes added
Merge branch 'master' of https://github.com/jbhicks/ViskoAPI

Conflicts:
	.classpath
	war/WEB-INF/classes/edu/utep/team4/ViskoAPI/client/ViskoAPI$1.class
	war/WEB-INF/classes/edu/utep/team4/ViskoAPI/client/ViskoAPI.class
Merge branch 'master' of https://github.com/jbhicks/ViskoAPI

Conflicts:
	.classpath
	war/WEB-INF/classes/edu/utep/team4/ViskoAPI/client/ViskoAPI$1.class
	war/WEB-INF/classes/edu/utep/team4/ViskoAPI/client/ViskoAPI.class
	war/dist/js/bootstrap.js