before merge
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from JingyuanHu/master

admm
A small fix
Header File
RLS
Merge pull request #5 from GuoSongtao/master

RLS
Commit before merging
tt
try merging
pack non-linear solvers
python extension LSs
Merge pull request #6 from GuoSongtao/master

python extension Least Squares Method
Merge remote-tracking branch 'origin/master' into pr/7

Conflicts:
	include/Header
	python/Vectorwrapper/build/lib.win32-2.7/geVec.pyd
	python/Vectorwrapper/build/temp.win32-2.7/Release/geVec.def
	python/Vectorwrapper/build/temp.win32-2.7/Release/gevec.o
	python/Vectorwrapper/geVec.cpp
	python/Vectorwrapper/setup.py
delete