make viewModel
Merge branch 'master' of github.com:omiend/20141115_casleyconsulting_hackathon

Conflicts:
	app/views/index.scala.html
make list
Merge branch 'master' of github.com:omiend/20141115_casleyconsulting_hackathon
comit
Merge branch 'master' of github.com:omiend/20141115_casleyconsulting_hackathon

Conflicts:
	app/views/index.scala.html
	app/views/main.scala.html
click Action complete!
Merge pull request #3 from aisugita/master

click action complete!