Arggggg
Merge branch 'master' of https://github.com/andrewbruni/finalproject

Conflicts:
	application/views/pages/insert_blank.php