Rename full text search to fuzzy search.
Merge pull request #2 from marketboomer/sass_changes

Fixed CSS bugs using sass instead of less
remove renamed files
Merge pull request #3 from marketboomer/stock_transfer_search

Rename full text search to fuzzy search.
index on master: 5401aa5 Merge pull request #1 from marketboomer/remove_less_for_sass
WIP on master: 5401aa5 Merge pull request #1 from marketboomer/remove_less_for_sass
Merge pull request #4 from marketboomer/navbar_changes

Navbar changes
update gemfile.lock
thread_safe gem 0.3.0 yanked from rubygems.org. Explicitly adding version 0.2.0 to gem file to counter the problem
add .idea to gitignore'
gemfile lock
thread_safe 0.3.1; remove cancan dependency
thread_safe 0.3.1; remove cancan dependency
thread_safe 0.3.1; remove cancan dependency
Merge pull request #5 from marketboomer/ratjens

thread_safe 0.3.1; remove cancan dependency
csv_export now accepts a collection as the second parameter, with the default being the controller collection method
git ignore addition
Merge branch 'master' of https://github.com/marketboomer/nunchaku into sass_changes

Conflicts:
	.gitignore