Merge

Signed-off-by: Jeff Sherin <jeffrey.sherin@gmail.com>
gitignore

Signed-off-by: Jeff Sherin <jeffrey.sherin@gmail.com>
Merge branch 'master' of https://github.com/calioasis/owaves

Signed-off-by: Jeff Sherin <jeffrey.sherin@gmail.com>

Conflicts:
	.DS_Store