Force commit
Merge branch 'Update'
Merge branch 'master' of https://github.com/jpyoung/UML_Gen
Merge Commit
fixing table view
merge stuff
Merge branch 'master' into Update

Conflicts:
	application/controllers/upload.php
fixed table output