rm uneeded .idea from repo, appended .idea/* to .gitignore
starting angular components, added scss/bootstrap to static
adding html and static files
editing html and static files
editing html and .bowerrc
removing bower_components from repo
removing bower_components from repo
adding wsgi.py
preparing for merge to master, lots of edits
Merge branch 'devbranch'

Conflicts:
	.bowerrc
	.gitignore