factored out main
Merge branch 'master' of github.com:uberj/Winter2013

Conflicts:
	cs440/project1/Main.java
Merge branch 'master' of github.com:uberj/Winter2013

Conflicts:
	cs440/project1/Main.java
Merge branch 'master' of github.com:uberj/Winter2013
stuff works