Merge branch 'development' of https://github.com/tktl-app-ideas/appideas into development
Merge branch 'development' of https://github.com/tktl-app-ideas/appideas into development
Merge branch 'development' of https://github.com/tktl-app-ideas/appideas into development
Merge pull request #52 from hwikgren/development

List only the keywords attached to the ideas on the page when user views ideas with a specific keyword

resolves #51
Merge branch 'development' of https://github.com/tktl-app-ideas/appideas into development
gem file
buttons
Add links to charts

Lean chart
Working hours tracking
buttons-show.
Merge pull request #54 from hwikgren/patch-1

Add links to charts
Created User model to enable voting and comment

Also added one test user to seeds.rb
Merge pull request #56 from akesulah/development

Created User model to enable voting and comment
last version...
Fix keywords bug in users_controller
Merge pull request #57 from akesulah/development

Fix keywords bug in users_controller
last version
Merge branch 'development' of https://github.com/tktl-app-ideas/appideas into development
Merge branch 'development' of https://github.com/akesulah/appideas into development
Merge branch 'vote' into development

Conflicts:
	db/schema.rb
Add possibility to add comments