changed seed file
Merge branch 'master' of https://github.com/whyu/wdi_project_2 into development
ajax notes from clayton
Merge branch 'development'