modified:   src/lisp/lang/Cons.java
	modified:   src/lisp/lang/Lisp.java
	modified:   src/lisp/lang/Symbol.java
Merge branch 'master' of https://github.com/hoodng/Jisp

Conflicts:
	src/lisp/lang/Cons.java
	src/lisp/lang/Lisp.java
	src/lisp/lang/Symbol.java

	new file:   src/lisp/io/LispReader.java
	modified:   src/lisp/lang/Cons.java
	new file:   src/lisp/lang/Context.java
	new file:   src/lisp/lang/Discardable.java
	new file:   src/lisp/lang/Function.java
	new file:   src/lisp/lang/JavaFunc.java
	modified:   src/lisp/lang/Lisp.java
	new file:   src/lisp/lang/LispException.java
	new file:   src/lisp/lang/LispFunc.java
	modified:   src/lisp/lang/Symbol.java