one weird file
ignore idea
idea files
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/styles/main.scss
Merge branch 'master' into design
finished card styles
finished card styles
finished card styles
Merge remote-tracking branch 'origin/master' into design

Conflicts:
	.gitignore
	.idea/misc.xml
	.idea/modules.xml
	.idea/vcs.xml
	app/views/blockDirective.html
Merge remote-tracking branch 'origin/master' into design
Delete conf-registration-web.iml
styled modal
edited html and css of sign-in box
Make elements editable
continued editing html and css of sign-in box
finished editing html and css of sign-in box
Merge branch 'design' into designEdit
Merge remote-tracking branch 'origin/design' into design
Merge branch 'design' into designEdit

Conflicts:
	app/views/blockDirective.html
Fixed block drag/drop issues.