added word and time limit
some commit
ignore database
Merge branch 'bryan'
ignore plan
ignore plan
Minor
Halfway Ajax