add setup file and move all other files up one dir level

convexengineering / gplibrary

Useful subsystem models

MIT License

10 stars 11 forks source link

Closed pgkirsch closed 8 years ago

pgkirsch commented 8 years ago

Closes issue #56

Ready for review @whoburg @bqpd

bqpd commented 8 years ago

Oops, now this has major merge conflicts after merging classmethods :(

whoburg commented 8 years ago

huh weird -- this merges into master fine on my computer.

bqpd commented 8 years ago

Github's just confused, then?

whoburg commented 8 years ago

I'm going to try merging this on my computer and pushing to master. Wish me luck.

whoburg commented 8 years ago

merged manually.