created tables and models
Controllers ready
Merge pull request #2 from justinphelps/master

header v1
Merge pull request #1 from fiddler-crabs-2014/chore/create_tables

created tables and models
add seeds file
Merge pull request #4 from fiddler-crabs-2014/chore/create_tables

add seeds file
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/Gemfile
Merge branch 'tihuan-master'
Merge pull request #3 from tihuan/master

Controllers ready
fix gemfile conflict
Merge branch 'master' of https://github.com/fiddler-crabs-2014/Mega-Survey
Bcrypt ready
Merge pull request #5 from tihuan/master

Bcrypt ready
starting surveys view
Merge branch 'master' into chore/html
edit user validations
Merge pull request #6 from fiddler-crabs-2014/chore/validations

Chore/validations
Delete index.erb
Delete this crap.

Merge branch 'master' of https://github.com/fiddler-crabs-2014/Mega-Survey

Conflicts:
	source/app/views/index.erb
wtf timmy?!