messed up landing page
Merge branch 'master' of https://github.com/VictorChenLi/TagItWebServer

Conflicts:
	TagItWebServer/.metadata/.log
	TagItWebServer/.metadata/.plugins/com.aptana.core.io/connections.20

TagItWebServer/.metadata/.plugins/com.aptana.syncing.core/defaultConnect
ion.20
	TagItWebServer/.metadata/.plugins/com.aptana.syncing.core/sites.20

TagItWebServer/.metadata/.plugins/com.aptana.webserver.core/webservers.2
0

TagItWebServer/.metadata/.plugins/org.eclipse.core.resources/.root/.inde
xes/properties.index

TagItWebServer/.metadata/.plugins/org.eclipse.core.resources/.safetable/
org.eclipse.core.resources

TagItWebServer/.metadata/.plugins/org.eclipse.core.runtime/.settings/com
.aptana.theme.prefs

TagItWebServer/.metadata/.plugins/org.eclipse.core.runtime/.settings/org
.eclipse.ui.ide.prefs

TagItWebServer/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settin
gs.xml

TagItWebServer/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
Merge branch 'master' of https://github.com/VictorChenLi/TagItWebServer