Rename some files and add makefile

Related to #11
Add .ogg music option
Trim whitespace
Merge pull request #12 from erkie/make

Rename some files and add makefile