2nd commit, just adding basic stuf
Merge https://github.com/jamesrwu/Paoge

Conflicts:
	LICENSE