first commit
basic setup
Initial commit
Merge branch 'master' of https://github.com/toddwschneider/weddingram

Conflicts:
	.gitignore
css
postgres full text search, some small fixes
unicorn
fix for precompiling assets
tagline generator
highcharts improvements
bootstrap
design, recommended searches
click random search by default unless query is specified
redis pipeline
add some tooltips
support for math operators
button to cycle through slogans
twitter and facebook buttons
redirect non www
google analytics, chartbeat, shorter timeout