select placeholder text
Merge branch 'master' of https://github.com/kmorrison/caltech
add tracker template
Merge branch 'master' of https://github.com/kmorrison/caltech
some tracker stuff
update with master