added dalli and memcachier gems to gem file and updated config file to allow memcache in dalli_store
caching front page results
disaster
refactored populate search helper
resolved outdated caching system
fixed problem from someone choosing incorrect code in merge conflict
simultaneous solutions to previous merge conflict problem
Merge branch 'master' into regex
disaster
refactored populate search helper
edited to separate google tasks due to limitations
added method to clear cache
Merge branch 'regex'
added rake task to clear cache
Design of the front page form phase 1 done
new file:   app/assets/images/orange-back.jpg
new file:   app/assets/images/orange-back.psd
modified:   app/assets/javascripts/navigation.js
modified:   app/assets/stylesheets/main.scss
modified:   app/assets/stylesheets/nav.scss
modified:   app/assets/stylesheets/search.scss
modified:   app/assets/stylesheets/variables.scss
modified:   app/views/activities/_how_much_search.html.erb
modified:   app/views/activities/_search_form.html.erb
modified:   app/views/activities/_sentence_search.html.erb
modified:   app/views/activities/_what_search.html.erb
modified:   app/views/activities/_when_search.html.erb
modified:   app/views/activities/_where_search.html.erb
modified:   app/views/layouts/application.html.erb
Merge branch 'master' of https://github.com/thomasstephane/SYNthesis into design
Added gem fprinter for heroku live environment
modified:   Gemfile

Aded shadow on form text
modified:   app/assets/stylesheets/search.scss
modified:   app/assets/stylesheets/variables.scss
Style adjustment on the front page form
modified:   app/assets/javascripts/navigation.js
modified:   app/assets/stylesheets/search.scss
modified:   app/assets/stylesheets/variables.scss
added page caching on activities#index and activities#show, must remember to flush cache in scheduler
fixed error in seed file