Add code and resources.
Update .gitignore
Resolve conflict
Merge branch 'master' of github.com:magkades/lopster