Merged Joell's programon class

- Merged the master project with Joell's programon commit