menu
merge conflicts
commiting to allow pull
javascript update
Merge branch 'master' of https://github.com/NicholasJay/cardMe
cards controller update
Merge branch 'master' of github.com:NicholasJay/cardMe into companyInfo
initial dashboard design
update cards js
company summary
Merge pull request #29 from tadaya/companyInfo

Company info
got jquery menu bar working
company summary working
added arrow and plus buttons that show right dashbaord options
merge conflicts
merge conflicts
Merge branch 'master' of github.com:NicholasJay/cardMe
Merge pull request #31 from dmitryjum/master

work on card design in progress
Merge branch 'companyInfo' of github.com:tadaya/cardMe into tadaya-companyInfo

Conflicts:
	app/assets/javascripts/cards.js
	app/controllers/cards_controller.rb
Merge branch 'master' of github.com:NicholasJay/cardMe