convert to rails
convert to rails
add ftp processing
more ANgularization
remove logs
gitignopre
gitignopre
Merge branch 'master' of https://github.com/trevorthornton/file_browse
Merge branch 'master' of https://github.com/trevorthornton/file_browse

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/assets/javascripts/angular/app.js
	app/assets/javascripts/angular/controllers.js
	app/assets/javascripts/angular/filters.js
	app/assets/javascripts/angular/services.js
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.scss
	app/models/filesystem.rb
	app/views/layouts/application.html.erb
	app/views/layouts/static_pages.html.erb
	app/views/static_pages/index.html.erb
	config/application.rb
	config/routes.rb
	db/migrate/20140423180004_create_filesystems.rb
	db/schema.rb
	public/data/sample.json
	tmp/cache/assets/development/sass/ef795644e9f0cb27ea24efd159ff472f72c6b079/application.scssc
	tmp/cache/assets/development/sass/ef795644e9f0cb27ea24efd159ff472f72c6b079/global.scssc
	tmp/cache/assets/development/sass/ef795644e9f0cb27ea24efd159ff472f72c6b079/variables.scssc
	tmp/cache/assets/development/sprockets/352bab412d75fa19d0a07504553b59df
	tmp/cache/assets/development/sprockets/6e1bd95023705b5529e7ccc754a02867
	tmp/cache/assets/development/sprockets/92613a75279536c4bcf4f3ba6cfde494
Revert "Merge branch 'master' of https://github.com/trevorthornton/file_browse"

This reverts commit 4e947dd53633c25af23a34446a5094684d16384b, reversing
changes made to 22dffd1cc0abb4be933506320fedbd34cde749ee.