no changes
removed uneeded assets, styled some stuff
Merge branch 'master' into dev_ed
merging
Merge pull request #30 from albertodotcom/dev_ed

Dev ed