First commit. Did not use git for alpha coding.
Merging from github