Initial commit
Added basic application files
Merged conflicts