merge test
repo inception
testing branch
Merge pull request #1 from Eventalist/yoshiemuranaka

merge test
branch test
Merge pull request #2 from Eventalist/tdshap

testing branch
Delete hello.txt
Delete something.txt
new file
Merge pull request #3 from Eventalist/tdshap

new file
premerge
fixed merge conflict
Merge pull request #5 from Eventalist/TimoorKurdi

test
eric fixed his shit
Merge branch 'master' of github.com:Eventalist/Eventalist
updated ERD
updated ERD AGAIN
schema
Merge pull request #6 from Eventalist/tdshap

schema
seed.rb