Spring cleaning
Trivial : Moved assets into assets folder
Merge pull request #15 from nj3ma/dev

Dev