Initial commit
Adding license and. Fixing merge.
Updating controls layout