diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..f44bbba9f4165bd286791553a7ffa3b8602e594a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,19 @@
+.metadata/
+build/
+target/
+.DS_Store
+.classpath
+.idea
+.project
+.settings
+openblocks.iml
+bin/
+.settings/
+*~
+src/main/resources/com/ardublock/block/ardublock.zip
+deploy.sh
+<<<<<<< HEAD
+=======
+test-output
+src/main/resources/com/ardublock/block/littlebits/files
+>>>>>>> upstream/master
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..4a737e3e7101db8a009cc4f8062e39383947cf41
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,7 @@
+language: java
+  - openjdk7
+  - openjdk6
+  - oraclejdk7
+  - oraclejdk6
+before_install: ./install_openblocks
+install: mvn validate && mvn install