Added some synonyms
Cleaning up JS
Before design meeting Searhbuilder
Merge branch 'experimental' of github.com:rivalee/express_prototype into experimental

Conflicts:
	public/javascripts/searchBuilder.js
	public/sass/application.scss
	public/stylesheets/application.css
	views/search-builder.html
Final countdown
Clean up HTML