Test commit
Merge branch 'master' of https://github.com/DIYAutomotive/DIYAutomotive

Conflicts:
	pom.xml
Add tag lib templating
Merge branch 'master' of https://github.com/DIYAutomotive/DIYAutomotive

Conflicts:
	src/main/webapp/WEB-INF/GeneratedSolution.jsp
	src/main/webapp/index.jsp
	src/main/webapp/new_user.jsp
Update Css styling
Added in a lot of necessary stuff, Service Loader regex parsing yada yada
Merge branch 'master' of github.com:B-rabbit54/DIYAutomotive into B-rabbit54-master
user input text box made with logic tied to response
Merge branch 'master' of github.com:DIYAutomotive/DIYAutomotive

Conflicts:
	src/main/webapp/index.jsp
merge with Brian's stuff
Fix Homepage to use css template
fixed capitalization logic
Merge branch 'master' of github.com:xtinkyx/DIYAutomotive into xtinkyx-master
fixed cap logic again..
Merge branch 'master' of github.com:xtinkyx/DIYAutomotive into xtinkyx-master

Fix caps bug