Added mac .DS_STORE to gitignore
Back to sqlite
Merge pull request #1 from ArtengineInc/angular-injection

Adding angular support to app
Merge remote-tracking branch 'origin/master' into angular-injection

Conflicts:
	Gemfile
	Gemfile.lock
	config/database.yml