Pulling all files from gh-pages into master, then deleting web-based files

I am only leaving the java and class files for the calculator for easy download. The web based files are being merged for simplicity and then deleted, rather than being kept for download.