Moved the pages to the correct branch

.gitignore

@@ -27,4 +27,5 @@ node_modules
 # Users Environment Variables
 .lock-wscript
 
-_site
+.DS_Store
+dist

.travis.yml

@@ -0,0 +1,6 @@
+language: node_js
+node_js:
+   - "0.10"
+before_install: npm install -g grunt-cli
+install: npm install
+before_script: grunt 

Gruntfile.js

@@ -0,0 +1,61 @@
+module.exports = function(grunt) {
+
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
+    concat: {
+      options: {
+        separator: ';'
+      },
+      dist: {
+        src: ['src/**/*.js'],
+        dest: 'dist/<%= pkg.name %>.js'
+      }
+    },
+    uglify: {
+      options: {
+        banner: '/*! <%= pkg.name %> <%= grunt.template.today("dd-mm-yyyy") %> */\n'
+      },
+      dist: {
+        files: {
+          'dist/<%= pkg.name %>.min.js': ['<%= concat.dist.dest %>']
+        }
+      }
+    },
+    nodeunit: {
+      all: ['test/*_test.js']
+    },  
+    jshint: {
+      files: ['Gruntfile.js', 'src/**/*.js', 'test/**/*.js'],
+      options: {
+        globals: {
+          jQuery: false,
+          console: true,
+          module: true,
+          document: true
+        }
+      }
+    },
+    watch: {
+      files: ['<%= jshint.files %>'],
+      tasks: ['jshint', 'nodeunit']
+    },
+    jsdoc : {
+        dist : {
+            src: ['src/*.js'], 
+            options: {
+                destination: 'dist/doc'
+            }
+        }
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-uglify');
+  grunt.loadNpmTasks('grunt-contrib-jshint');
+  grunt.loadNpmTasks('grunt-contrib-nodeunit');
+  grunt.loadNpmTasks('grunt-contrib-watch');
+  grunt.loadNpmTasks('grunt-contrib-concat');
+  grunt.loadNpmTasks('grunt-jsdoc');
+
+  grunt.registerTask('test', ['jshint', 'nodeunit']);
+  grunt.registerTask('default', ['jshint', 'nodeunit', 'concat', 'uglify', 'jsdoc']);
+};

README.md

@@ -1,5 +1,8 @@
 <<<<<<< HEAD
 # tzx.js
+
+[![Build Status](https://travis-ci.org/kmp1/tzx.js.svg)](https://travis-ci.org/kmp1/tzx.js)
+
 A javascript .tzx (and .tap) data file API (for converting ZX Spectrum games to wav files)
 =======