diff --git a/.travis.yml b/.travis.yml
index 6a9da8fbb..b1ad37013 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,19 @@
 language: node_js
 node_js: 5
 
+# note that travis still builds PRs so that covers
+# other branches
+branches:
+  only: 
+    - master
+    - development
+
 install:
+  - rvm install 2.3.1
   - npm install
 
 script:
+  - rvm use 2.3.1 && gem install danger --version '~> 4.0' && danger
   - mkdir -p dist/css dist/js
   - node_modules/.bin/node-sass scss/all.scss dist/css/all.css
   - node_modules/.bin/webpack
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..4a8750713
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,8 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/).
+
+(Note for Alex: fill in what kind of versioning we want to use)
+
+## [Unreleased]
diff --git a/Dangerfile b/Dangerfile
new file mode 100644
index 000000000..6cfa33ba7
--- /dev/null
+++ b/Dangerfile
@@ -0,0 +1,6 @@
+# Add a CHANGELOG entry for app changes
+has_app_changes = !(git.modified_files.grep(/js/).empty? && git.modified_files.grep(/scss/).empty?)
+if !git.modified_files.include?("CHANGELOG.md") && has_app_changes
+  fail("Please include a CHANGELOG entry.")
+  message "See http://keepachangelog.com/en/0.3.0/ for details on good changelog guidelines"
+end