cleaned up gitignore
	modified:   .gitignore
	modified:   build.sbt
	modified:   src/main/scala/HyperClass.scala
Merge branch 'master' of github.com:charleybeller/hyperclass

Conflicts:
	target/resolution-cache/hyperclass/hyperclass_2.10/0.1-SNAPSHOT/resolved.xml.properties
	target/resolution-cache/hyperclass/hyperclass_2.10/0.1-SNAPSHOT/resolved.xml.xml
	target/resolution-cache/reports/hyperclass-hyperclass_2.10/compile-internal-resolved.xml
	target/resolution-cache/reports/hyperclass-hyperclass_2.10/compile-resolved.xml
	target/resolution-cache/reports/hyperclass-hyperclass_2.10/docs-resolved.xml
	target/resolution-cache/reports/hyperclass-hyperclass_2.10/optional-resolved.xml
	target/resolution-cache/reports/hyperclass-hyperclass_2.10/plugin-resolved.xml
	target/resolution-cache/reports/hyperclass-hyperclass_2.10/pom-resolved.xml
	target/resolution-cache/reports/hyperclass-hyperclass_2.10/provided-resolved.xml
	target/resolution-cache/reports/hyperclass-hyperclass_2.10/runtime-internal-resolved.xml
	target/resolution-cache/reports/hyperclass-hyperclass_2.10/runtime-resolved.xml
	target/resolution-cache/reports/hyperclass-hyperclass_2.10/sources-resolved.xml
	target/resolution-cache/reports/hyperclass-hyperclass_2.10/test-internal-resolved.xml
	target/resolution-cache/reports/hyperclass-hyperclass_2.10/test-resolved.xml
	target/streams/$global/compilers/$global/out
	target/streams/$global/ivy-configuration/$global/out
	target/streams/$global/update/$global/out
	target/streams/compile/$global/$global/data
	target/streams/compile/run/$global/out