Mostly Completed ParallelogramFragment and parallelogram_detail
Merge remote-tracking branch 'original/master'

Conflicts:
	.idea/workspace.xml
Mostly Completed ParallelogramFragment and parallelogram_detail