Working on edit
Need to figure out why not working. >:(
slight mod
Added chicago
fix edit
Very rudimentary EasyBib integration, also quick fix for the limited search returns
Account Settings merge

Conflicts:
	app/views/layouts/application.html.erb
	db/schema.rb
deleted messages
merge fix
Merge branch 'master' of github.com:jchen006/HackFSM into FILTERS
WAVE issues.
Fixed minor sign in issue.
Another first search
Created Orbit Slider + AweSum TEI BoilerPlate
TEI Boilerplate
Merge branch 'FILTERS'
merge fix on master
TEI-Boilerplate
removed tei stuffs for now...
fixed merge errors