regular commit
Merge remote-tracking branch 'origin/master'
regular commit
Regular commit
Merge branch 'master' of https://github.com/CraigZheng/CustomImageBoardViewer

Conflicts:
	CustomImageBoardViewer/en.lproj/Main_iPhone.storyboard