First Merge Attempt

Hey I am attempting to store the code I created yesterday up here for collaboration. I still need to work on a few things related to it though, like why some static files are not being seen by, possibly included in .gitignore and some other code cleanup items.