updating .gitignore
removing binary files from git tracking
serving static content from jetty server
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	project/target/resolution-cache/default/spray-person-build/scala_2.10/sbt_0.13/0.1-SNAPSHOT/resolved.xml.properties
	project/target/resolution-cache/default/spray-person-build/scala_2.10/sbt_0.13/0.1-SNAPSHOT/resolved.xml.xml
	project/target/resolution-cache/reports/default-spray-person-build-compile-internal.xml
	project/target/resolution-cache/reports/default-spray-person-build-compile.xml
	project/target/resolution-cache/reports/default-spray-person-build-docs.xml
	project/target/resolution-cache/reports/default-spray-person-build-optional.xml
	project/target/resolution-cache/reports/default-spray-person-build-plugin.xml
	project/target/resolution-cache/reports/default-spray-person-build-pom.xml
	project/target/resolution-cache/reports/default-spray-person-build-provided.xml
	project/target/resolution-cache/reports/default-spray-person-build-runtime-internal.xml
	project/target/resolution-cache/reports/default-spray-person-build-runtime.xml
	project/target/resolution-cache/reports/default-spray-person-build-scala-tool.xml
	project/target/resolution-cache/reports/default-spray-person-build-sources.xml
	project/target/resolution-cache/reports/default-spray-person-build-test-internal.xml
	project/target/resolution-cache/reports/default-spray-person-build-test.xml
	project/target/streams/$global/update/$global/inputs
	project/target/streams/$global/update/$global/out
	project/target/streams/$global/update/$global/output
	project/target/streams/compile/exportedProducts/$global/export
	project/target/streams/runtime/dependencyClasspath/$global/export
	project/target/streams/runtime/exportedProducts/$global/export
	project/target/streams/runtime/fullClasspath/$global/export
	project/target/streams/runtime/internalDependencyClasspath/$global/export
added angular
Merge pull request #2 from gangstead/master

updated gitignore, remove binary files from git, serving static content from jetty server