changes from Roy#4

Open

YanxiChen-gh wants to merge 12 commits intoproject-anacapa:masterfrom

YanxiChen-gh:master

Commits on Mar 9, 2016

add one more
Claustrophobia
committed

Commits on Mar 10, 2016

try travis
Claustrophobia
committed
try travis
Claustrophobia
committed
Update .travis.yml
Baby Pepper
committed

Commits on Mar 18, 2016

try
Claustrophobia
committed
try
Claustrophobia
committed
Merge branch 'master' of https://github.com/ncbrown1/anacapa-github-prototype
Claustrophobia
committed
syntax error
Claustrophobia
committed
try again
Claustrophobia
committed
only test features
Claustrophobia
committed
travis doesn't seem to work with selenium
Claustrophobia
committed
fix syntax
Claustrophobia
committed