merge conflicts :(
merging
merge conflict
routes workinggit add .
some css stuff
Merge pull request #42 from Eventalist/tdshap

Tdshap
merge conflict
boostrap sucks
Merge pull request #43 from Eventalist/yoshiemuranaka

boostrap sucks
merge conflict
added 2 apis
Merge branch 'master' of github.com:Eventalist/Eventalist into tdshap
Merge pull request #44 from Eventalist/tdshap

Tdshap
fixed merge conflicts
die merge die