4 commits

Author	SHA1	Message	Date
Luke Bennett	2f8fada6c0	Fixed conflicts	2016-08-18 23:46:23 +01:00
Luke Bennett	49c7ca2a27	Fixed spec and improved formatting	2016-08-18 18:17:56 +01:00
Luke Bennett	f91fd18f25	Improved spec, waiting on sprockets-es6 to work with rspec....	2016-08-18 18:17:56 +01:00
Luke Bennett	dcf09a532b	Moved changes across to es5 and changed spec to es6	2016-08-18 18:17:56 +01:00