master reset
added a few files from dev