Initial Merge

Merged my Eclipse workspace data into the repo