Edited schema
Merge branch 'master' of https://github.com/Adrian2014/Historical_Wiki into specs
Add assets to precompile
Updated gemfile
Edited precompile array
Edited production environment
Merge pull request #17 from Adrian2014/label_upgrade

Label upgrade and removed date formatting on displays where tests were broken
Switched timeline to d3; Implemented zooming; Working on transitions
tags working, have to still work on the tag search
something changed
Merge branch 'making_tags'
merging
Merged with master
Merge branch 'master' of https://github.com/Adrian2014/Historical_Wiki into label_upgrade
Merge pull request #19 from Adrian2014/timeline

Timeline
Merge branch 'master' of https://github.com/Adrian2014/Historical_Wiki into label_upgrade
Made changes to the login, show html file
schema.rb changed not sure how
Merge branch 'master' of https://github.com/Adrian2014/Historical_Wiki into label_upgrade
Post form changes for labels