Remove trailing whitespace from codebase
Merge from master and resolve conflicts
Remove backup files added by mistake
Remove unintentionally added alert files
Restore modifications to png files made by mistake
Ignore .DS_STORE used by Mac OS for image thumbnails
Merge pull request #35 from dionyziz/trailing_whitespace

Trailing whitespace