Merge branch 'v3'

Conflicts:
	LICENSE

Gruntfile.coffee

@@ -40,6 +40,12 @@ module.exports = (grunt) ->
         ]
         dest: 'tmp-<%= pkg.type %>/script.coffee'
 
+      meta:
+        options: concatOptions
+        files:
+          'LICENSE':   'src/General/meta/banner.js',
+          'latest.js': 'src/General/meta/latest.js' 
+
       crx:
         options: concatOptions
         files:
@@ -77,6 +83,7 @@ module.exports = (grunt) ->
 
     concurrent:
       build: [
+        'concat:meta'
         'build-crx'
         'build-userscript'
       ]

LICENSE

@@ -1,9 +1,5 @@
 /*
-<<<<<<< HEAD
-* appchan x - Version 2.2.2 - 2013-08-04
-=======
-* 4chan X - Version 1.2.25 - 2013-08-04
->>>>>>> v3
+* appchan x - Version 2.2.2 - 2013-08-05
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE

latest.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
 postMessage({version:'2.2.2'},'*')
-=======
-postMessage({version:'1.2.25'},'*')
->>>>>>> v3