Initial commit
First commit
Fixing merge
Adding .gitignore
Removing .idea folder from tracking
Merge branch 'refs/heads/gh-pages'

Conflicts:
	app/bookmarks/directives/CreateBookmarkDirective.js
	app/bookmarks/directives/EditBookmarkDirective.js
MERGE GONE BAD!
Cleaning up