added -Wcast-align to makefile (in comment)
fixed merge conflict Makefile