run ga and pso
Merge branch 'master' of github.com:pranj/ECE457AProject

Conflicts:
	run_ga.m