commit
Merge branch 'master' of https://github.com/wondermac/Task8-Repo.git

Conflicts:
	src/controller/GoogleAction.java
Draft of Index.
updated the date input drop-down boxes
and the category drop-down list
update the js and css lib
try to solve the conflict
solve the conflict
Merge branch 'master' of https://github.com/wondermac/Task8-Repo.git

Conflicts:
	WebContent/index.jsp