Maquina de estados de canasta
Merge remote-tracking branch 'origin/master'

Conflicts:
	FallingCubes/FallingCubes.gise
	FallingCubes/FallingCubes.xise
	FallingCubes/_ngo/netlist.lst
	FallingCubes/_xmsgs/pn_parser.xmsgs
	FallingCubes/_xmsgs/xst.xmsgs
	FallingCubes/iseconfig/FallingCubes.projectmgr
	FallingCubes/iseconfig/main.xreport
	FallingCubes/main.bgn
	FallingCubes/main.bit
	FallingCubes/main.bld
	FallingCubes/main.cmd_log
	FallingCubes/main.drc
	FallingCubes/main.ncd
	FallingCubes/main.ngc
	FallingCubes/main.ngd
	FallingCubes/main.ngr
	FallingCubes/main.pad
	FallingCubes/main.par
	FallingCubes/main.pcf
	FallingCubes/main.syr
	FallingCubes/main.twr
	FallingCubes/main.twx
	FallingCubes/main.unroutes
	FallingCubes/main_bitgen.xwbt
	FallingCubes/main_envsettings.html
	FallingCubes/main_guide.ncd
	FallingCubes/main_map.map
	FallingCubes/main_map.mrp
	FallingCubes/main_map.ncd
	FallingCubes/main_map.ngm
	FallingCubes/main_map.xrpt
	FallingCubes/main_ngdbuild.xrpt
	FallingCubes/main_pad.csv
	FallingCubes/main_pad.txt
	FallingCubes/main_par.xrpt
	FallingCubes/main_summary.html
	FallingCubes/main_summary.xml
	FallingCubes/main_usage.xml
	FallingCubes/main_xst.xrpt
	FallingCubes/par_usage_statistics.html
	FallingCubes/usage_statistics_webtalk.html
	FallingCubes/webtalk.log
	FallingCubes/webtalk_pn.xml
	FallingCubes/xst/work/work.sdbl
	FallingCubes/xst/work/work.sdbx