added 260 to all
Merge branch 'master' of github.com:jnebeker/nova-teen