remove conflict in app
Merge branch 'cj-sql'

Conflicts:
	app.js
minor changes to app.js
Merge branch 'master' of https://github.com/cjacks0413/rss into cj-sql
basic ui and database functionality