Changed structure of main.py

- Arg passing is cleaner (each set of physical parameters is stored as a
  dict).
- Handles changing the number/types of expected args much better.
Merge branch 'master' of https://github.com/dkong1796/ay190-final

Conflicts:
	main.py