fix conflict
add glyph-icon for sigup form
use teaspoon for testing javascript
config teaspoon
commit after pulling from remote branch