added a spec/features folder with commented tests because.
fixing merge conflict in JSON
Merge pull request #20 from Cynaria/misc

Misc