imusync
Merge branch 'master' of https://github.com/elsingc/SeniorDesign

Conflicts:
	iseconfig/Mojo-Base.projectmgr
	iseconfig/mojo_top.xreport
Merge branch 'master' into gps

Conflicts:
	Mojo-Base.xise
	src/mojo_top.v
	syn/Mojo-Base.gise
	syn/_ngo/netlist.lst
	syn/_xmsgs/map.xmsgs
	syn/_xmsgs/pn_parser.xmsgs
	syn/_xmsgs/xst.xmsgs
	syn/mojo_top.bgn
	syn/mojo_top.bin
	syn/mojo_top.bit
	syn/mojo_top.bld
	syn/mojo_top.cmd_log
	syn/mojo_top.drc
	syn/mojo_top.ncd
	syn/mojo_top.ngc
	syn/mojo_top.ngd
	syn/mojo_top.ngr
	syn/mojo_top.pad
	syn/mojo_top.par
	syn/mojo_top.pcf
	syn/mojo_top.prj
	syn/mojo_top.ptwx
	syn/mojo_top.syr
	syn/mojo_top.twr
	syn/mojo_top.twx
	syn/mojo_top.unroutes
	syn/mojo_top_guide.ncd
	syn/mojo_top_map.map
	syn/mojo_top_map.mrp
	syn/mojo_top_map.ncd
	syn/mojo_top_map.ngm
	syn/mojo_top_map.xrpt
	syn/mojo_top_ngdbuild.xrpt
	syn/mojo_top_pad.csv
	syn/mojo_top_pad.txt
	syn/mojo_top_par.xrpt
	syn/mojo_top_summary.xml
	syn/mojo_top_usage.xml
	syn/mojo_top_xst.xrpt
	syn/par_usage_statistics.html
	syn/usage_statistics_webtalk.html
	syn/webtalk.log
	syn/webtalk_pn.xml
	syn/xlnx_auto_0_xdb/cst.xbcd
	syn/xst/work/work.sdbl
	syn/xst/work/work.sdbx