update
update
ipdate
updateMerge branch 'master' of https://github.com/atemkeng/Windowing-Functions

Conflicts:
	m_paper.aux
	m_paper.bbl
	m_paper.blg
	m_paper.log
	m_paper.pdf
	m_paper.tex.backup