added autocompete for entering tags
fixed merge conflicts
Merge branch 'master' of github.com:besolow/cs147-final-project